From a329822207ccd02ec5bfab9519067dabd5a19a8e Mon Sep 17 00:00:00 2001
From: Isaku Yamahata <yamahata@valinux.co.jp>
Date: Tue, 22 Jul 2008 12:15:02 +0900
Subject: [PATCH] [IA64] kexec: Move sal.h to asm-ia64/linux-xen/asm as it
 needs to be modified

A subsequent patch will modify sal.h, so it needs to be moved from
xen/include/asm-ia64/linux-xen/asm/sal.h to
xen/include/asm-ia64/linux/asm/sal.h and the relevant README.origin
files need to be updated accordingly.

Cc: Isaku Yamahata <yamahata@valinux.co.jp>
Signed-off-by: Simon Horman <horms@verge.net.au>
---
 xen/arch/ia64/xen/xensetup.c                        | 2 +-
 xen/include/asm-ia64/linux-xen/asm/README.origin    | 1 +
 xen/include/asm-ia64/{linux => linux-xen}/asm/sal.h | 0
 xen/include/asm-ia64/linux/asm/README.origin        | 1 -
 4 files changed, 2 insertions(+), 2 deletions(-)
 rename xen/include/asm-ia64/{linux => linux-xen}/asm/sal.h (100%)

diff --git a/xen/arch/ia64/xen/xensetup.c b/xen/arch/ia64/xen/xensetup.c
index fc88e929c8..7ccc4051cf 100644
--- a/xen/arch/ia64/xen/xensetup.c
+++ b/xen/arch/ia64/xen/xensetup.c
@@ -31,7 +31,7 @@
 #include <xen/rcupdate.h>
 #include <xsm/acm/acm_hooks.h>
 #include <asm/sn/simulator.h>
-#include <linux/asm/sal.h>
+#include <asm/sal.h>
 
 unsigned long xenheap_phys_end, total_pages;
 
diff --git a/xen/include/asm-ia64/linux-xen/asm/README.origin b/xen/include/asm-ia64/linux-xen/asm/README.origin
index 51dba8e2a4..54085bd268 100644
--- a/xen/include/asm-ia64/linux-xen/asm/README.origin
+++ b/xen/include/asm-ia64/linux-xen/asm/README.origin
@@ -20,6 +20,7 @@ pgalloc.h		-> linux/include/asm-ia64/pgalloc.h
 pgtable.h		-> linux/include/asm-ia64/pgtable.h
 processor.h		-> linux/include/asm-ia64/processor.h
 ptrace.h		-> linux/include/asm-ia64/ptrace.h
+sal.h			-> linux/include/asm-ia64/sal.h
 smp.h			-> linux/include/asm-ia64/smp.h
 spinlock.h		-> linux/include/asm-ia64/spinlock.h
 system.h		-> linux/include/asm-ia64/system.h
diff --git a/xen/include/asm-ia64/linux/asm/sal.h b/xen/include/asm-ia64/linux-xen/asm/sal.h
similarity index 100%
rename from xen/include/asm-ia64/linux/asm/sal.h
rename to xen/include/asm-ia64/linux-xen/asm/sal.h
diff --git a/xen/include/asm-ia64/linux/asm/README.origin b/xen/include/asm-ia64/linux/asm/README.origin
index bd7e269b94..612cec3f56 100644
--- a/xen/include/asm-ia64/linux/asm/README.origin
+++ b/xen/include/asm-ia64/linux/asm/README.origin
@@ -30,7 +30,6 @@ param.h			-> linux/include/asm-ia64/param.h
 patch.h			-> linux/include/asm-ia64/patch.h
 pci.h			-> linux/include/asm-ia64/pci.h
 rse.h			-> linux/include/asm-ia64/rse.h
-sal.h			-> linux/include/asm-ia64/sal.h
 sections.h		-> linux/include/asm-ia64/sections.h
 setup.h			-> linux/include/asm-ia64/setup.h
 string.h		-> linux/include/asm-ia64/string.h
-- 
2.30.2